Merge from trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 12 Feb 2011 02:27:53 +0000 (21:27 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sat, 12 Feb 2011 02:27:53 +0000 (21:27 -0500)
commit04f48b54de102ccfe2bdcb0dd2e2f279574c5fe1
treea8bf072d5f2bc095b718b80fcff55cc9d234f5b8
parenta2a11e6792213fac4e0330ab191ffd1872244c3c
parente9a2ff5f9030bd3a3fb7ad3db8211eb2439bd9e6
Merge from trunk
25 files changed:
aclocal.m4
configure
doc/lispref/elisp.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
lisp/ChangeLog.trunk
lisp/dired.el
lisp/emacs-lisp/edebug.el
lisp/server.el
lisp/simple.el
src/ChangeLog.trunk
src/alloc.c
src/buffer.c
src/callint.c
src/config.in
src/data.c
src/doc.c
src/eval.c
src/fns.c
src/image.c
src/keyboard.c
src/lisp.h
src/lread.c
src/minibuf.c
src/print.c